[SOLARIS] Don't build ptrace code on Solaris.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/Config.mk b/Config.mk
index 0c72e24a95c00aab04d33762edd2afeed32902ea..31de41c88baf0292e28779675ee21b9afff7b79e 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -9,6 +9,8 @@ XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
 XEN_TARGET_X86_PAE  ?= n
 XEN_OS              ?= $(shell uname -s)
 
+CONFIG_$(XEN_OS) := y
+
 # Tools to run on system hosting the build
 HOSTCC     = gcc
 HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer

diff --git a/config/ia64.mk b/config/ia64.mk
index 4fab1118beef965af9712e91077f53b807a2b877..7cf99d9b695b1cce10542e777e7d1416664bc42c 100644 (file)
--- a/config/ia64.mk
+++ b/config/ia64.mk
@@ -1,4 +1,6 @@
 CONFIG_IA64 := y
+CONFIG_IA64_$(XEN_OS) := y
+
 CONFIG_IOEMU := y
 CONFIG_XCUTILS := y
 

diff --git a/config/powerpc64.mk b/config/powerpc64.mk
index ee717ecd64c2543c8dbfaa3d2495b89488ff53f2..9773b24a6c9b2a10fdd39f45a6e69f1ca1f69d0a 100644 (file)
--- a/config/powerpc64.mk
+++ b/config/powerpc64.mk
@@ -1,4 +1,5 @@
 CONFIG_POWERPC := y
+CONFIG_POWERPC_$(XEN_OS) := y
 
 CFLAGS += -DELFSIZE=64
 LIBDIR := lib

diff --git a/config/x86_32.mk b/config/x86_32.mk
index e4b21e2e6c5f22b7b296f6d3390e9a8f5d18c988..4db3c73b3b0babaf26636ac975bc9d123a619539 100644 (file)
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -1,4 +1,6 @@
 CONFIG_X86 := y
+CONFIG_X86_$(XEN_OS) := y
+
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y

diff --git a/config/x86_64.mk b/config/x86_64.mk
index 53883a6efccb6026822e34d5258434708d88d458..c76567563c5bea24bc346339ed398ccc0fd6bd6d 100644 (file)
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -1,4 +1,6 @@
 CONFIG_X86 := y
+CONFIG_X86_$(XEN_OS) := y
+
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 64be0322417e2ea201a49739552daa897761d605..6a5036b3f688102b96ff68d78dcf55f082ed4caf 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -5,8 +5,6 @@ all:
 
 include $(XEN_ROOT)/Config.mk
 
-CONFIG_$(shell uname -s) := y
-
 XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore

diff --git a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
index c87096d1c406e20d2e9eb7f4d8c46cd67f07cca1..8b0b6d944ab24e15bcb02d44f1e6ffe6ebe6ba10 100644 (file)
--- a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
+++ b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
@@ -36,8 +36,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <xenctrl.h>
-#include <thread_db.h>
-#include <xc_ptrace.h>
 
 #define TRACE_ENTER /* printf("enter %s\n", __FUNCTION__) */
 

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 198f1992b062f5194dc4f595a2e808bd6a2d27cd..3f2787c471b4b91cec5cd3a6d6d824a2aeffda6d 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -15,8 +15,9 @@ CTRL_SRCS-y       += xc_private.c
 CTRL_SRCS-y       += xc_sedf.c
 CTRL_SRCS-y       += xc_csched.c
 CTRL_SRCS-y       += xc_tbuf.c
-CTRL_SRCS-$(CONFIG_X86) += xc_ptrace.c xc_ptrace_core.c xc_pagetab.c
+CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c
 CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c
+CTRL_SRCS-$(CONFIG_X86_Linux) += xc_ptrace.c xc_ptrace_core.c
 
 GUEST_SRCS-y :=
 GUEST_SRCS-y += xc_load_bin.c

diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h
index 513daed6f97fff10501a4e3a133aee201c82cf7c..1f92df6225e1c148c11d5418c5bcc17af806439c 100644 (file)
--- a/tools/libxc/xc_private.h
+++ b/tools/libxc/xc_private.h
@@ -30,6 +30,9 @@
 #define DECLARE_SYSCTL struct xen_sysctl sysctl
 #endif
 
+#undef PAGE_SHIFT
+#undef PAGE_SIZE
+#undef PAGE_MASK
 #define PAGE_SHIFT              XC_PAGE_SHIFT
 #define PAGE_SIZE               (1UL << PAGE_SHIFT)
 #define PAGE_MASK               (~(PAGE_SIZE-1))

diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
index d1a9f1358045c2fad0d2131faf35c6ef254c1c6b..2525417f1680f437be42519a66b4ac6e2a0d3e77 100644 (file)
--- a/tools/libxc/xc_ptrace.c
+++ b/tools/libxc/xc_ptrace.c
@@ -1,5 +1,3 @@
-#define XC_PTRACE_PRIVATE
-
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 #include <time.h>

diff --git a/tools/libxc/xc_ptrace.h b/tools/libxc/xc_ptrace.h
index 1c3f10b1d00c44d6e4ffcc0226a1b360d68e9e19..baaadb5b0b613781f5f7b9262db024b77ed17727 100644 (file)
--- a/tools/libxc/xc_ptrace.h
+++ b/tools/libxc/xc_ptrace.h
@@ -1,9 +1,6 @@
 #ifndef XC_PTRACE_
 #define XC_PTRACE_
 
-#include <thread_db.h>
-
-#ifdef XC_PTRACE_PRIVATE
 #define X86_CR0_PE              0x00000001 /* Enable Protected Mode    (RW) */
 #define X86_CR0_PG              0x80000000 /* Paging                   (RW) */
 #define BSD_PAGE_MASK (PAGE_SIZE-1)
@@ -160,25 +157,4 @@ struct gdb_regs {
 }
 #endif
 
-#endif
-
-typedef void (*thr_ev_handler_t)(long);
-
-void xc_register_event_handler(
-    thr_ev_handler_t h,
-    td_event_e e);
-
-long xc_ptrace(
-    int xc_handle,
-    enum __ptrace_request request,
-    uint32_t  domid,
-    long addr,
-    long data);
-
-int xc_waitdomain(
-    int xc_handle,
-    int domain,
-    int *status,
-    int options);
-
 #endif /* XC_PTRACE */

diff --git a/tools/libxc/xc_ptrace_core.c b/tools/libxc/xc_ptrace_core.c
index d57da3f172707cb93d85a3bcba5be17a6736edfa..03bbf318a30795bd129280d64b73585f90f63744 100644 (file)
--- a/tools/libxc/xc_ptrace_core.c
+++ b/tools/libxc/xc_ptrace_core.c
@@ -1,5 +1,3 @@
-#define XC_PTRACE_PRIVATE
-
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 #include "xc_private.h"

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index d74c1c8c275f9d45d79a3547bdbab51385ad8d65..d3f03681181e8dbcfa35728af313af81ae01ec09 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -16,7 +16,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <sys/ptrace.h>
 #include <xen/xen.h>
 #include <xen/domctl.h>
 #include <xen/sysctl.h>
@@ -105,6 +104,11 @@ int xc_find_device_number(const char *name);
  * DOMAIN DEBUGGING FUNCTIONS
  */
 
+#ifdef __linux__
+
+#include <sys/ptrace.h>
+#include <thread_db.h>
+
 typedef struct xc_core_header {
     unsigned int xch_magic;
     unsigned int xch_nr_vcpus;
@@ -134,6 +138,26 @@ int xc_waitdomain_core(
     int *status,
     int options,
     vcpu_guest_context_t *ctxt);
+typedef void (*thr_ev_handler_t)(long);
+
+void xc_register_event_handler(
+    thr_ev_handler_t h,
+    td_event_e e);
+
+long xc_ptrace(
+    int xc_handle,
+    enum __ptrace_request request,
+    uint32_t  domid,
+    long addr,
+    long data);
+
+int xc_waitdomain(
+    int xc_handle,
+    int domain,
+    int *status,
+    int options);
+
+#endif /* __linux__ */
 
 /*
  * DOMAIN MANAGEMENT FUNCTIONS

diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h
index c471e94cb6d23060020fd1de493f9cb7fa329a24..63ad2bcfdc5c41ff52ec3c3865351fef68b47271 100644 (file)
--- a/tools/libxc/xg_private.h
+++ b/tools/libxc/xg_private.h
@@ -79,10 +79,6 @@ unsigned long csum_page (void * page);
 #define L4_PAGETABLE_ENTRIES    512
 #endif
 
-#define PAGE_SHIFT              XC_PAGE_SHIFT
-#define PAGE_SIZE               (1UL << PAGE_SHIFT)
-#define PAGE_MASK               (~(PAGE_SIZE-1))
-
 typedef uint32_t l1_pgentry_32_t;
 typedef uint32_t l2_pgentry_32_t;
 typedef uint64_t l1_pgentry_64_t;